ASoC: Intel: cht_bsw_rt5672: check return value #4698
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Set codec sysclk could fail and return error, add error check for it. Signed-off-by: Chao Song <[email protected]>
aiChaoSONG
requested review from
lgirdwood,
plbossart,
ranj063,
kv2019i,
dbaluta,
bardliao,
ujfalusi,
vijendarmukunda,
kuanhsuncheng and
yaochunhung
as code owners
ujfalusi
reviewed
Nov 10, 2023
| if (ret < 0) { | ||
| dev_err(card->dev, "failed to set codec sysclk: %d\n", ret); | ||
| return ret; | ||
| } |
There was a problem hiding this comment.
Should we still do the clk_disable_unprepare() even in error case?
There was a problem hiding this comment.
I don't think so, there's other calls to snd_soc_dai_set_sysclk() in the same file and in other drivers, none of them call clk_disable_unprepare() on failure. All just print and return error.
There was a problem hiding this comment.
@ujfalusi @aiChaoSONG I think clk_disable_unprepare() is still needed when snd_soc_dai_set_sysclk() return error.
Turn on/off the clock is the main purpose of platform_clock_control().
There was a problem hiding this comment.
we have a similar behavior in two other machine drivers:
ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_RCCLK,
48000 * 512,
SND_SOC_CLOCK_IN);
if (!ret)
clk_disable_unprepare(priv->mclk); ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_RCCLK,
48000 * 512, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(card->dev, "can't set codec sysclk: %d\n", ret);
return ret;
}
clk_disable_unprepare(ctx->mclk);so I vote to align and think later if this makes sense.
plbossart
approved these changes
Nov 10, 2023
bardliao
approved these changes
Nov 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Set codec sysclk could fail and return error, add
error check for it.